fix: undefined override set conflicts shouldn't error #8760
+114
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wraithgar
reviewed
Nov 20, 2025
|
|
||
| static doOverrideSetsConflict (first, second) { | ||
| // If either override set is missing, there's no conflict | ||
| if (!first || !second) { |
Member
There was a problem hiding this comment.
You're only gonna be able to get coverage here with a unit test because half of this is already being done upstream
else if (this.overrides && this.#to.edgesOut.size && OverrideSet.doOverrideSetsConflict(this.overrides, this.#to.overrides))
So, we should add && this.#to.overrides to the calling code intead.
Member
There was a problem hiding this comment.
OR remove the this.overrides from the calling code.
Contributor
Author
There was a problem hiding this comment.
@wraithgar done - i added the this.#to.overrides to the callsite. I kept the original guard as well because I think it is still practical and safe.
owlstronaut
force-pushed
the
owlstronaut/override-set-conflict-fix
branch
from
84e9b27 to
8a1e79d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #8757
This pull request improves the robustness of the
OverrideSetclass by ensuring that thedoOverrideSetsConflictmethod can safely handle cases where one or both arguments areundefinedornull. It also adds corresponding test coverage to verify this behavior.It is apparently common for there not to be a second override set, so it is causing errors in 11.1.3